From 946ff1d12478db9ce6edc88fcc1e2075f061a9c5 Mon Sep 17 00:00:00 2001 From: Gianni Tedesco Date: Tue, 25 Jan 2011 18:27:43 +0000 Subject: [PATCH] xl: Check domain existance when doing domain identifier lookups [ Code formatting fixed up to conform to libxl style. -iwj ] Signed-off-by: Gianni Tedesco Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 26bf83cc30..5826755ee6 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -143,11 +143,25 @@ static int qualifier_to_id(const char *p, uint32_t *id_r) static int domain_qualifier_to_domid(const char *p, uint32_t *domid_r, int *was_name_r) { - int was_name; + libxl_dominfo dominfo; + int was_name, rc; was_name = qualifier_to_id(p, domid_r); - if (was_name_r) *was_name_r = was_name; - return was_name ? libxl_name_to_domid(&ctx, p, domid_r) : 0; + if (was_name_r) + *was_name_r = was_name; + + if (was_name) { + rc = libxl_name_to_domid(&ctx, p, domid_r); + if (rc) + return rc; + } else { + rc = libxl_domain_info(&ctx, &dominfo, *domid_r); + /* error only if domain does not exist */ + if (rc == ERROR_INVAL) + return rc; + } + + return 0; } static int cpupool_qualifier_to_cpupoolid(const char *p, uint32_t *poolid_r, -- 2.30.2